changed maps
merged master