Add more T650 trickery