Replased old grids with the new one

See: #14