made some changes, yo92