Gav,

Full flash (and two step) no longer required, just make the amendments and then cal flash in the changes. Until you get happy/confidence do the cal flash then trundle along gently to check the log before venturing into aggressive throttle/high map areas.

Cheers

Jim