Incorporated all files from Matteo's computer