Here is an update to the 0002 patch to account for recent changes.