attempting some changes for search
merging changes made at yariv