Commit from Richard.