Changed some methods to static