Final Changes done