added map-toggle, map-hook