use less hard coded versions