yoyo, more changes!