removed an exception and removed some code duplication for players