roughly finish the architecture adjustment