STEP 1 (cont): A few tweaks