Updated message.c