working on new message implementation