More work on player discard