Data shaping (12/35)

Data shaping