Initialization
Solved merge conflict