Optimised for size a bit more