revision after review of version 1.0 by Bastiaan