Flickering fixed, new update method