Changed simulator generation. Need to add uncentered data and test normalization