use the new api instead of #find