changes from the re-org still out there