less flicker - still a few glitches