fixed
small changes in the architecture