About to try optimising my version