Updated for new registration order.