Finishing bab 2
Merging changes