1. Add extraCondition