some changes to the builder