comments and changes