Added comments #16