added EDTS support