added new parser and arranged old one.