Change initioalisation place
Merged commit