updated to be multispecies compatible