more complete than 0.98, plus homogenizing the package in a single one will save us from conflicts during bulk builds (and during manual builds too).