Some changes for @krmarien en @vierbergenlars