adding useful parser
adding new stuff
fix merge conflic