merge Eliot's suggestions