Improved step 2: Setup.