First modification!

A lot more code than one would need...