updated prompts
merging changes
fixing prompt text
merging changes