Improved animation (Still needs fix)