Fix the broken factory coverage system again.  Two, count them, two more procedure rewrites.