Final Account/Affiliate update

Final Account/Affiliate update