This should fix most of the glitches were going to get