Build using sam's discourse patches