Working version with non-uniform grid
working with non-uniform grid