Updated to flicker with data