added fname for D2 case