Re-instated Sam's changes (i.e. reverted all reverts from Nov 8)