separated maps, implemented toggle