more working
map bug