Switched instrument and dsa changes to the right setup.tmpl file.