made some changes, yo7