Changes in the noise generation.
Merge branch 'zhang'