New and latest mods.

Not working on xfer goals computation