Updated matching logic and tile assignments