cleanup, implemented new animation