Added np mode stuff to support demand-dialling