Maybe more like this for #52.