Finalise exercise 1