now that we support units, we can leave them on the router messages