Updated static method and demo.