Final Version

Final updates