Data shaping (27/35)

Data shaping