Reverted initial multi-dimensional stuff, currently working with row sampling