Second pass on toggler