Partially updated after review