More major reworking of the system