Some updates for order