Updated and Final Version