build mode performance greatly improved