Accomodating for PVP update