Added 'which' pre-tests before versions