Better version of NIIN nonboarding stops