minor adaptations