Last part of exercises
Merge conflicts