#223 Changes after review