added required changes after previous review