a lot of adjustments to new arch