Changes for PvP