Running faster

Reg tested - still works