follow comments from Martin