made some changes, y12