working on real wraping
Reorder and real wrap