Redid a bit of seasonal logic