Implemented search, changes for free distribution.