Added more problems
Changed solution