add make-set and clean up use of old versions