Simplified the code for swithing to the extra buffer