fixed some of the lag