Changed function to static