merge comments from Martin Pels