NS updated stuff