@mourner suggestions updated