Refacor to eliminate strict ordering of players