changes to the architecture