added search capablities