rework building of the more-polished version