made some changes, y3