1. Rename variable
2. Add contain condition