Use bigger grid for hash
Refactor