Some changes to assignment 2, doesn't work how it should work. :-)