Updated after review tasks