Added optimization patch