Update by O'brien and Gere