more static changes