more builder updates