Updating: very minor tidying up.
Updating: merging