Solved 2 more problem