Updated to try and fix mobile lag