Complete Update on Code