parser process changed
some changes and refactoring