small modif in prepare order