change place of find_by method