Complete rework of the adding system+pen system