Final Changes made