made static method private non-static; changed include order