Updated aniaml and main