Data shaping (16/35)

Data shaping