Update based on comments from @stuart-mclaren