Some more work on r-star.