Incorporating the G-TFSF Concept into the Analytic Field Propagation TFSF Method