refactoring grid again
refactoring