Changes by Markus