update
refactor, rm static method