Map changes2

This is rebased and fixed up. Please use this one