Better order item create/update/Round 2