moving to a more flexible architecture