more adaptations to new conventions