Updated for Quinn