added multi species support