made some changes, y17