Starting Changing for using Both DFT and Avg

NOT BUILDING DO NOT USE