made some changes, yo94