re-arrange setup