Changed from instance method to static method