adaptation for new builder