Change to static method