slow toggle
fix merge conflicts