Updated according new changes in skipped message.