Substance (rework)

Substance (rework)