builder architecture redesign + bug fix