changes for new architecture