Start of the reworking