trying to simplify hubs interface a bit