Update variables to close #32