refactor to use com.traffitruck