Added stuff from the second clone of the repository