rework the buses by type