Changes for the case where order is partially paid