Optimise for less memory usage