Re-uploading part of the project due to merging issues