Small improvement (to be tested)