added required changes after review