Fixing

Trying to improve speed, at the moment its too slow.