Changed A lot in exercise 2