changes to how messaging is handled