"More user_order tweaks"