2021-01-11: Adjustments for System4