Martin's suggestions