New files for Mattamy opt