merged Corinne and Nathan's files