Change prompts as per QA request