Chnages in the message section logic