Rework after feedback from Edwin.