re-arrange stuff