Changed some semantic ordering