change animations order and logic