Added flicker control