Animal, Client and Main updated