start fixing the builder