restructured, added the traffic bits