Upgrade state animation

by Toni Adegbenro