Enough size optimising to warrant taking it off the todo