converted all methods to static