More changes to map