Updated Mattamy optimization file