Changes after review from Jarek (e-mail: 2012-01-31)