Still has the flicker issue