made some changes and additions