update builder, separate tasks