take findall from @rviding develop branch