Re ordering (16/32)

Re ordering