static changes refactored