build rework in progress