Solved two more problems