changes to autogen to allow other versions