Fixed init methods
Fixed merge conflicts