more changes trying to make nonstatic