Updates for using animal instead of animals
Merged