made some changes, y6