Imported updated message.c