Update to include edits made by Josh and J-M