Changes_16Aug_final

Code will all the latest changes