Attempts at fixing flicker