First set of changes from Markus