changes using new architecture