Changed all methods to static