Updated code for all species