Rework of animation values