Data shaping (22/35)

Data shaping