Trying to fix a lag issue