changes proposed from Martin's review