2nd version, clean of the code
scnd commit