Simplified toggling logic