integrated all changes from Animal project