Merged comments from Peter, Sarah, Sam & Mario.