Traffic Wave Generator 2.0