Introduced animations. More Restructuring