building changes from #54