Implemented comments by Tim Jenness