Faster re-arrange