Paths created from given file, minor bug fixes
Resolved Conflict