2DFT merge
First version