removed seperate static calls