Inadequate tracking of orders

Other Re issues: