Updated files to allow for both search and index
ready to submit but needs comments