FInal Changes