Some feedback from @patriksvensson