static mode refactor