Re ordering (20/32)

Re ordering