first stab at patching