Updated for Ryan