Merged Brendan's changes to the main branch