Animation revamp (partial)