Solved Puzzle 7 and 17