Refactored No-Show Fix