changes after review comments