made some changes, yo3