renamed, added partitioning and diginorm