more adaptations for msp