Data shaping (25/35)

Data shaping