rework of the system, now deals