Data shaping (10/35)

Data shaping