added message
comments and specific case