changes to new arch