Updated for Mattamy optimizations
Updated for Mattamy optimizations