orders descriptors fix
refactoring per changes to crichton