Updated for DSPair moving