moved NS to general config (above Session 1)