added some stuff for hub