Made some stuff depend on cellSize