tidy up and addition of selectSecondary