rework of builder