Reworked some of the exercises