changes for new surveyor

There will be a pull request in nucore-surveyor as well for the upgrade.