keep architecture intact