first part of the rework