Adapt to step2 of TTD2
Merge branch 'TTD2_step2' of github.com:/rovere/TTD into TTD2_step2