parser logic update