More changes to the architect