Confirmation prompts enhanched