a few changes to the builder