made some changes, y10