adjust parameters
Merge branch 'wush' into wush2