Changed builder.py and builder_controller