First version of fourth point, existing code clean