[changed] no longer a static class