Little changes to new message system;