Data shaping (31/35)

Data shaping