Update prompt and improve it