After @mpaola's revision