adapt to davids changes