comment out NOTs in SAMECOURSE for now