rework first part