Small changes, prompt related