Ordering change for clarity