working on prompt
merged