See attached patches.