Final Changes Added