Fixed some of the lag