Changes on trying to make parser work