merge
refactor procedure for support changing
update animal method