20130912-04

The simulation is refined. Need to do more larger testing