Merging allinone,improving parser