Initialization changed
Fixed merge conflicts