Added new problems, still needs optimization