Initial changes for WordFind