Some adaptations