finalizing that little re-arrange