changed some static method issues