Interpreter work, corrected the wrong pattern matching uses