changed parser a bit