Update the patch according to Vinod's comments