Changed parser a bit