update for generic NextBus functionality