A bit more tuning to the prompt script