Fix it up to run smoother.