Updating Final Version