Laura FitzgeraldGoing to address some small comment from paul wright, then I will merge and close the issue