Map works
Fixed merge conflicts