Re ordering (12/32)

Re ordering