Re ordering (15/32)

Re ordering