Changes after review no. 2