I'm updating these changes on this branch too
merging more of Cormacs changes