Redesign hub logic