message generator improved