added dummy implementation of map
merge cleanup