Update per Christopher's suggestion