Incorporate comments from Martin.