new map

new test map and some changes