Changed timing function to linear