Final version of the patch