reshuffling
improve delta_phi stuff