more reworking of animation