Modification after review comments