More work on PvP