made some changes after review