made some changes, yo97