Tweaked criteria to solve faster
Couple optimizations, still need to check a few things
Yeah, that should do it.