switching to find_each to try and improve efficency