merging changes from TDT4 with ULTRAROSS