Speed optimalisation and fixed the damn thing!