added cases for different types of messages