Updated to use the new pending stories etc.