Fixed bug and new parser