Work on traffic system.
Merged