Fixed major lag issues