fine-tune logic for show