Re ordering (24/32)

Re ordering