Adding more solvers
Fixing intersection check