Faster switching performance