Unglobalized stuff
Fixed merge conflicts