Updated changes -- parser and scanner work with if statements