Working on flickering when updating

Still needs work