Added solution to more problems