minor adaptations...