add haiku commuter route and some refactoring