Added fast buffer switching