Changed NiOverride to return arrays into the appropriate functions