add builder from rewrite branch