CQM: changes from André's review (07.09.2013).