Super-mega search is on!
merge changes