Multiple rings at the same time, some tweaks, refactoring needed