merge fj into 3d