Greatly simplify multiple expressions

Actually we just need two simple buffers