Changes to usage order