Modified for DF output