small changes in the architecture