Add solution and comments