Radically simplify, fixing glitches