modify find to find_by_name
modify first