Made some changes to the reshape.... not sure if it is working right.
Better Changes now.