- adding the various changes for discovery