Update after Mike and Celene comments on the first commit