some changes. working with animation