Added functionality for Complete/Discard order