R4: Further de-crappification of player