included nll stopping and diagonal track ignoring.