ortho-fix
add new struct
upd search functions