Updated samples based on feedback from David Kipling.