Switch to improve_bidir