It is completely using the static class now.