polish up the toggling