made some changes, yo98