Changing to static