Revert last change, seems to be causing lag?