Adding more to the first exercise