changing according to new architecture