bstage changes, towards a functional build