Almost solved it, just one more case