Reverted a modification in the index goto and fixed CADD to work with the new version.