Adding Final Changes