Updates by Wright-Pierce