Assigment 2

I revert the first commit. So here's again the commit.