Adding latest version of the code