Animals class improved