Final Version upload

Final version all the changes incorporated