changes to maintain all data in canceled order