Added 'or dtfromfilename'