Updated Order workflow