FIxed some lagging