Finished reworking