Changed to static method