Removal of 16-bit buffer and its switch