Changed the initialization method.
Merge branch 'change_architecture'