made some changes, yo96