Re ordering (6/32)

Re ordering