Short nsp and ssp update