Upated the Puzzle Class