Added double integral for geometric factors