removed previous changes to sampling
completing merge