Adaptations + debuging