updating static vars to make more sense