Updated Puzzle and Tile again