Add some adaptivity