First modification and solution 1 commited