Processed review comments of 17th of July.