Redid ring system fixes.