Changes made.
Merged files correctly.