Finalizing exercise 3