Defined some new variables, couldn't pick up comments with regex