Updated parser - for loops work fine