Final with patch files