I think i finished the reworking.