Question 16: comments and modifications