Upgrading to work with new communication