some changes in the architecture