made some changes, y4