added everyone's change and updated map scale