slight ordering change