Flicker stuff added