Added distance switch to NAPP