IMPROVEMENT on grid names