made some requested changes