Expand the exercises a bit