Step 2
fix r selection