made some changes, yo130710