Final commit for matrix branch