- Savanna defines
- IP check moved