Comm updates (might actually work)