Re-arrange SETUP