Updated exercise2