temp commit for new architecture