Added distance option to NAPP