YJ- Solver is a static class now