updated message system