Final tweaks to exercise2