Changed newer methods to static