Changes after review and testing