Add option to return full dataset rather than the NCC sample