tried to clean up map_manipulation - not working