fixed huge lagging issue