Change find_by to where and add recent