[DNM] optimise