address comments from Tom and Henk