Updated to static method