Grid search added