Updating exercise17 and adding exercise18