Highway system revamp

fix the damn highway system