included all the comments from Peter Laursen