A few changes, still has two bugs, Markus will have a look at it on Tuesday.