Added criteria and problems to solve