Improved flicker prevention...