made some changes, yo2