refactor for animations in progress