Updated main patch