Optimised a bit