Updated exercise 2 definitions