Updated animation controller