S100

Some adjustments