Changed mapping of buffer switching.