changed some methods to be static