Added support for unlimited players