more merge with Eliot's