added new simpler parser