Updated for new NS authentication