Update to reflect comments