yay end movement refractoring