updated search
merged