better active player handling