Updated flicker to match or remove