Changed a few methods to static