Updated World with cell_matches
Updated condition