Exercise-06/07 partial update