Changes after the discussion from 14.01.2013 with Klaus, Jonny and Justus