optimised the optimised - not sure in theory though