some edits for pvp