made some changes on dev branch