fixed a bit of lags