adapataion for new builder