change the pagination and added optional comments