Made changes to match most recent changes in order entry in core