changed to traversal style routing
Merge branch 'part02'