finished add_map() and remove_map()