Updated for first time search