Major overhaul for speed! Managed to get speed up 5-10 times