Markus' updates