Adjustments and feedback from Arjen Poutsma