Fixed bug, added new Fromparser