Change to old circ.buff. and implemented parser lookup table