Merge in Jon Reid's changes