Update order and formatting