moving to builder-style construction