Updated animation system