comments and messages added