RF: More work to get it to be compatible with vistasoft conventions.