More reasonable player mapping