Work in progres
Fixed merge conflicts