Proposed changes after review