added friendly find where needed