Updated whole message system