better solution to unsaved orders