Rework next player changing