Implement Arthur's suggestions