parser2 need some testing 

parser2 finished