Changed to static