Added effect animation, class renaming