includes felix's changes to parser class