Changes from Markus from 08/03/2013