Revert previous commits. Lag still occurs a lot, going to wait until 1.2.4.1 to work on this again