STEP 3: Add Enhancements