Updated design for grid search