made some changes too