Re ordering (7/32)

Re ordering