Half working integration of NR/AD into the run tab