Latest Updates to code