Merge success

Nasty merge need review...