Improving toggle detection
Improved strip