made some changes, yo93