minor modifications related to builders