changed to use true etoolbox toggles