Updated marking code for exercise 2