Second parser now working with current combinations